gtk: Update GtkGesture users to the GtkPropagationPhase semantics change

Mainly doing s/TARGET/BUBBLE/ on the fully ported widgets, but GtkTreeView
where the double click handler has moved to GTK_PHASE_TARGET so it runs
parallelly to the still existing event handlers.

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 3e10ec64aa8c7094dd0109d414ae85be6bf28be0..17a1f9d9873934ba052fffaa9f5eecf997f21920 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -653,7 +653,7 @@ gtk_button_init (GtkButton *button)
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->gesture), GDK_BUTTON_PRIMARY);
   g_signal_connect (priv->gesture, "pressed", G_CALLBACK (multipress_pressed_cb), button);
   g_signal_connect (priv->gesture, "released", G_CALLBACK (multipress_released_cb), button);
-  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_TARGET);
+  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_BUBBLE);
 }
 
 static void

diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index ddad1dfadb43d2cf9aef51263dbd21169c340732..4c1bbef1856f1c0cc365e9cc1884de34c4179018 100644 (file)
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -410,7 +410,7 @@ gtk_color_plane_init (GtkColorPlane *plane)
   g_signal_connect (plane->priv->drag_gesture, "drag-end",
                    G_CALLBACK (plane_drag_gesture_end), plane);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (plane->priv->drag_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (plane->priv->drag_gesture),
                                      FALSE);
 
@@ -418,7 +418,7 @@ gtk_color_plane_init (GtkColorPlane *plane)
   g_signal_connect (plane->priv->long_press_gesture, "pressed",
                     G_CALLBACK (hold_action), plane);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (plane->priv->long_press_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
 }
 
 static void

diff --git a/gtk/gtkcolorscale.c b/gtk/gtkcolorscale.c
index 9a60579884f396f9691e52f0106b7703781402d2..9f882ba6f567c799799ccf662da2d01fa65e7a12 100644 (file)
--- a/gtk/gtkcolorscale.c
+++ b/gtk/gtkcolorscale.c
@@ -259,7 +259,7 @@ gtk_color_scale_init (GtkColorScale *scale)
   g_signal_connect (scale->priv->long_press_gesture, "pressed",
                     G_CALLBACK (hold_action), scale);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (scale->priv->long_press_gesture),
-                                              GTK_PHASE_BUBBLE);
+                                              GTK_PHASE_TARGET);
 }
 
 static void

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index e36f79cb2e690bc2ebb30b38ec080b85dfc59d84..21cedde65232a800d601e827cc3e89a6708804fe 100644 (file)
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -91,14 +91,14 @@ gtk_color_swatch_init (GtkColorSwatch *swatch)
   g_signal_connect (swatch->priv->long_press_gesture, "pressed",
                     G_CALLBACK (hold_action), swatch);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (swatch->priv->long_press_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
 
   swatch->priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (swatch));
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (swatch->priv->multipress_gesture), FALSE);
   g_signal_connect (swatch->priv->multipress_gesture, "pressed",
                     G_CALLBACK (tap_action), swatch);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (swatch->priv->multipress_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
 }
 
 #define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index b2c7390b8f12bf8cacc9bc4b46bba79a77e96d5f..75ad8ee33e87c0d54750d6aed953a4bc1f660ad7 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2702,7 +2702,7 @@ gtk_entry_init (GtkEntry *entry)
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->drag_gesture), FALSE);
   gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (priv->drag_gesture), TRUE);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->drag_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
 
   priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (entry));
   g_signal_connect (priv->multipress_gesture, "pressed",
@@ -2710,7 +2710,7 @@ gtk_entry_init (GtkEntry *entry)
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->multipress_gesture), FALSE);
   gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (priv->multipress_gesture), TRUE);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->multipress_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
 }
 
 static void

diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index ed305b079fc6044e32bdeb99f81de9003e90eac7..210509c2514842637779cdbbe60ceb50c95798ca 100644 (file)
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -928,7 +928,7 @@ gtk_switch_init (GtkSwitch *self)
   g_signal_connect (gesture, "released",
                     G_CALLBACK (gtk_switch_multipress_gesture_released), self);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
   self->priv->multipress_gesture = gesture;
 
   gesture = gtk_gesture_pan_new (GTK_WIDGET (self),
@@ -940,7 +940,7 @@ gtk_switch_init (GtkSwitch *self)
   g_signal_connect (gesture, "drag-end",
                     G_CALLBACK (gtk_switch_pan_gesture_drag_end), self);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
   self->priv->pan_gesture = gesture;
 }
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 6552af201a2336af0159dfc4e56ea58bd87fee5d..a66e5f2a2d151b84603edd352db12ef2545bc649 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1556,7 +1556,7 @@ gtk_text_view_init (GtkTextView *text_view)
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->multipress_gesture),
                                      FALSE);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->multipress_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
   g_signal_connect (priv->multipress_gesture, "pressed",
                     G_CALLBACK (gtk_text_view_multipress_gesture_pressed),
                     widget);
@@ -1565,7 +1565,7 @@ gtk_text_view_init (GtkTextView *text_view)
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->drag_gesture),
                                      FALSE);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->drag_gesture),
-                                              GTK_PHASE_TARGET);
+                                              GTK_PHASE_BUBBLE);
   g_signal_connect (priv->drag_gesture, "drag-update",
                     G_CALLBACK (gtk_text_view_drag_gesture_update),
                     widget);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index a029b1a56b17ea1a2148db4cb9dd1f98f103cdd9..2269ce8e6cb93816e060ed7886de381103cea169 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1842,7 +1842,7 @@ gtk_tree_view_init (GtkTreeView *tree_view)
   g_signal_connect (tree_view->priv->multipress_gesture, "pressed",
                     G_CALLBACK (_tree_view_multipress_pressed), tree_view);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (tree_view->priv->multipress_gesture),
-                                              GTK_PHASE_BUBBLE);
+                                              GTK_PHASE_TARGET);
 }
 
 \f